Pushing rest of test upstream