Added more tests
Fixed analyzer