added more test types (to be continued ...)