Add Evaluation tests + general refactoring