Added more unit tests for type checking