added a Logout link to the templates and some Test Suites
merged tests.py files