Refactor evaluate test, WIP