Cleanup of the up method, adds more tests.
Ups test coverage for Main