Unify requirements
Allow test to be run with --all to run all tests
Merge branch 'feature/requirement-smoothing' into develop