Start of refactoring
Updated the page controller test