Preping tests to all run correctly