Added new mockup and test cases for POC3