Added more tests - 85% code coverage