Moved the appropriate tests into the base module