Remove requirements: not needed
Add more unittests