Adds type checking and testing for polycals