Continuation of flights tests + tests refactoring + fixes See merge request !45
mentioned in commit 1f9a0864