Added support for 'none' as 'type'. Added 2 new tests that check this new support.