REV: reverted the specialized tests back to integer type labels