Minor fixes
Checkpoint - got basic test case working again