Fixed tests to match up with new maintenance window