Still failing travis; enable -x again, add more waits on start-daemon and make model smaller