Breaking down test sections

I have fixed a considerable number of code fails also separated components of the test into individual files.