Fixed all tests.
Turn tests back on for Travis.