Outlines integration tests
Starts on feature tests
Merge branch 'master' into integration_tests
Finishes behavior tests