No, I'm uncommenting these tests in a separate pull request. If you guys don't mind I'd like to merge this PR as-is, so that we can start adding more tests without creating big merge conflicts :)