Add additional tests and travis-ci configuration