fix tests related to app/entity wrapping/unwrapping