Resolve merge issue
Update test runner to support unit and integration tests
Fix Flake8 violations