Run EC2 tests earlier
Fix missed method call after refactor
More fixes for EC2 tests