Refactored tests
Added more tests