added more tests and fixed the broken travis-ci