Use "make test" for running tests
Merge branch 'develop' of github.com:inercia/evy into develop