Integration tests - refactored out atom
Refactoring integration tests
Refactoring placeholders
Merge branch 'integration_tests' into develop