Fix feature tests

Quite hacky fix here - better fix already included in
realtime-client branch.