Fixed spec, made test more generic for travis...