Fix regexp bug, issue with stubbing, update tests with salts, .travis.yml updates