Fixing up tests that still need to be ironed out