Added additional scenario tests. Still need to finish going through all of the tests though.
Fixed flake8 issues.