wip - fix all expectedTests and liveTests