Fix broken test
Add more tests