Fix failing requirement tests. Fixies #623