Migrated some more tests to unity and fixed some more code style issues
Attach a file by drag & drop or click to upload
