Reorganising tests --

I split the test function files into four separate files.
Reorganising test suite --