boyscout: removing duplicate test code