Updated Unit testing to be more "Unit-fied"