Some cleanup in tests