Fixes to broken specs and a bugfix for running under team foundation server

Per our discussion on the group.