Starting to clean up initial tests