Added more tests
Style improvements