Reworked the tests to simplify them.
Fix the django tool bar.