Fixed tests and view and edit pages