Working on cleaning up tests