Cleanup commented test code