Some cleanup and new test on Linux after local test success