Clean up commented test code