refs #11 rebase type tests