Added some tests and cleaned up the classes.
Moved initializer code to constructor.