test fix
fix #14 - Avoid entity id override