Some very broken unit test (and some cleanup)

Started unit tests, but they are totally broken.