Tests of several modifications I made