Reinstate tests in setup.py