Fix existing tests, add some more