update unit test & update entities