test fixes
Moving to new repo