continue fixing up tests ect