Add tests
Add travis status image
Use better variable names