Added some more tests, plus thoughts on tests yet unwritten