Added Test, GenericDefines.