Added test framework
Modified Lambda expression version