refined tests, added missing terms report and done some cleanup