Add a StaticPages controller
Fix test cases