Fixed formatting, and made the tests actually test something, exposing some bugs.
Fixed formatting, and made the tests actually test something, exposing some bugs.

code-google-com/cortex-vfx,ruschelp/cortex-vfx,ruschelp/cortex-vfx,code-google-com/cortex-vfx,code-google-com/cortex-vfx,code-google-com/cortex-vfx,ruschelp/cortex-vfx