Fixes several tests that were failing under tester. Minor style cleanups otherwise
Attach a file by drag & drop or click to upload
