DATACOUCH-19 - change testing to not use bucket manager.