Tweak tests before minification/compilation stage
Merge branch '141-FileOrganiserManifest-Simplification' into daily