Commented some tests out to try to find out Travis CI problems.