Added two types of tests to Spout

Tests for the presence of a domain where variable type is 'choices' and checks for valid units in numeric/integer variables