Tidy up
Tidy up
Tidy up tests (toolbar and sanitizer not being used)