changed some test files and improved 1st version of grammar (clafer.cf file) [Bogdan]