Minor tweaks and made the test data useful