Tests
Merge branch 'master' of https://github.com/sergeijakovlev/flux.git