Testing cleanup (in progress)

[ci skip]