More test checks
Better type handling