Work on some more tests