Walshaw fixes and walshaw extending test