make test pass against new API
add more fields