Fix Bazaar support
Adding tests for Bazaar support