Removing remenants of old tests to get this working