More modernization of tests.
Added tests.
Moved instance variables to implementation.
Fixed spacing.
Removed unneeded test header files.