More tests
WIP hasOne