Added more tests
Added ENV variables on travis for testing
Some refactor