Fixing errors in tests and on the page