Merge "Unit test automation for Multilayer Evaluation"