Fixing some tests to keep travis-ci happy.