Finalised issues with tests.

Pre-fixed test methods with name of methods under test