BOOK-770, some fixes, now booking tests pass