Adding paper trail to versions and fixes tests