updated .merlin to include test files;
several property checks in TestTerm