applied patch
fixing tests
added entity test type, fixing tests, rename wrong config file.
working on fixing tests.
remove debug, fix tests
applied interdiff
fix options widget test
filter in test
revert date change, not related
remove debug and merge conflicts