Some tests fixed, the rest changed due to mini-refactor. You're gonna hate me, I know
Merge from integration v2.0
Another test fixed. Hopefully :)
Restoring...
DOMified
Merge pull request #493 from owdqa/fix/public_repo_round2

Fix/public repo round2