Ensure correct order of inner classes + integration tests