Add more unit page tests

Refactor based upon failures found by the tests.
Share more logic between the unit and container page tests