Travis-CI

Made code more testable