Merge pull request #1 from birmr003/master

Catchup
Testing new streucture
Reversed test changes
Merge pull request #2 from SueMay70/master

Testing