Continue refactor expected result into tests