Minor fixes & moved test version to main folder

Stuck the older versions in the 'Old versions' folder, for reference.