(#1022) - Avoid referencing PouchUtils in tests
(#1022) - Remove individual src file loading in tests