Added some more tests and methods.
Cleaned up some added another test.