Cleaning up unit testing

Making tests more atomic