Slowly restoring test cases after Luv refactor