Unit test Clean up and additions