Move into tests package