Modified mockup, started first test case