Undid some test changes from last commit