update some more stuff and more tests