Add some more tests

Some of these are failing, we should fix that