Minor change to unit. Leaving the virtual classes in caused strange errors.