Final changes, mainly formatting and more test data.