I suck and did too many changes in one commit.
Changed test files back to unit test style