Added new implementations for criteria evaluator + include .properties file when unit testing