Recipe fix and test fix