Reworked Special type, moved tests for Special type to discrete file