Fix feature tests

Quite hacky fix here - better fix already included in
realtime-client branch.
Merge synchronous-render into realtime-client
Add debug logging to assist feature test fix