Added a few tests for areas that were getting coverage, but not a good number of assertions or specific testing targeting.
Further minor re-arranging