Cleaning unmaintainable old tests. Covertura remains at 81%.