Some cleanup of the StateLocking test
Strange, file keeps marking itself as changed.