Use assert map to specify assert functions
More spacing for defines