Added MaintenanceWindow and updated TestCase