Updated tests, requirements