Refactor of Eval value unit test

Organized package