Cleanup of test config
Add some newlines, rename scripts slightly