Boyscout: make tests succeed