Working on refactoring tests
Added a few more tests