Additional tests and fixes to include error page