Fixed up tests so that they run