Add more tests, fix previous ones