More Test Coverage, Cleanup of Test cases