Reinstated some tests, and fixed test suite