Added more tests
fix conflict