fixed a bunch of tests, and added a few todos (and the corresponding jiras of course :))