fixing up tests and stuff