Added more tests

It doesn't compile now