Re-organise to include tests into a sdist