Moved test in line with code changes.