Added extra type tests