ticket:5 corrections to tests