Sudden problems with method workflows (revert 0c0ceac and 4a1d486)
Fix some broken tests