Fixed travis, added tests