maintenance period tests & bugfixes