A slight bug with back navigation fixed. Tests for the database completed.