revert until the stupid tests can be made to work