Code clean up on acceptance test projects