A bit more tests
Fixed requirements