Merge pull request #537 from AnnaStorozhenko/test

Integration tests for BTM and VU are fixed
Merge remote-tracking branch 'upstream/test' into development
Integration test in BTM, VU was rewrited from testcase to test
Merge branch 'development' of https://github.com/AnnaStorozhenko/Ajour into development