BOOK-770, some fixes, now booking tests pass
Merge pull request #970 from onepercentclub/feature/BOOK-770b

BOOK-770, some fixes, now booking tests pass