Little tests refactoring;
Travis update
Merge pull request #2 from szytko/master

Travis build passing