OPAL-2077: Formatting code, uncommenting a test