Small changes to test case before lunch