Manual concatenation -> getObjectType
Remove an old test patch
Change type instructions to use object types and add better validation/errors