Put all tests into subpackages of test, updated names as awell. Left
systemTests folder for time being because work is being done to it