added new syntax for entity chaining
tests: files renamed