Removing commented filters and updating EC2 specific tests