Polished QB - added more tests TBD