Modified allocation generation + add tests