Migrated majority of integration tests to new structure. Unit/Application tests to follow.