Restructure and more (correct) tests.