Added an upload page object and cleaned up the test further