Starts adding type tests