Add more unit tests; one test broken at the moment