expanded booking views and tests