Adds more tests.

Todo:

Item Tests
Review to ensure sad paths on methods are covered