Final changes from entityTest