detector and detector test updated

detector looks at type now, instead of value
test input includes types