Fixes for Address entity, DAO, test