Merge "ESCALATOR-40 add unittest framework"