Add ease to requirements
Test cleanup
More test fixups