Fixes in class import and type checks and some new tests data.