Make the testing framwork a bit more neat