Further testing fixes
Merge branch 'aspnet50' of https://github.com/MisterJames/AngelaSmith into aspnet50
merge
Merge branch 'aspnet50' of https://github.com/MisterJames/AngelaSmith into aspnet50
Fixing tests after the James/David destruction crew moved everything
Merge branch 'aspnet50' of https://github.com/MisterJames/AngelaSmith into aspnet50