corrections + add tests on controllers and entity