Cleaning up the test suite and error messages; also some cleaning in site layout