Simplify tesing and support travis-ci