Fix logic for test, add :kind_of and add additional error to test exception case.