Tidied all tests into Tests.common and removed unused code