Re-enable more tests
Merge pull request #724 from AaronMT/723

Re-enable more tests