Resolve the FIXME issues in the tests

* After a good night's sleep, looks a lot clearer