Fix file collisions by moving tests into the lib tree