fix test patterns - should rebase the commits properly