fixed some masspay methods, added to bootstrapper, added tests