Tests: code cleanup.