fix tests so that they pass -- but they need to be rewritten!
Merge remote-tracking branch 'jonathan/newinstaller' into newinstaller
bugfix fucking typo!