Removed redundant code and added more tests to satisfy criteria in story
Cleanup and updates to unit tests