started moving unit tests around