Clean up of tests (minor styling)