James C - fixed tests for Travis