Little clean up in test factories, finally blocks in integration test are now accepted.