[#83] Tests clean up