Add more tests

and another