fixed a refactor naming bug (not picked up yet) and added a large weight/delay retrival test