alignment of test case appears fixed
extracted some functions/includes into utils