More test fixes
psake Test task