added tests, kick travis