improved tests, fixed short downtime period