Proper trailing comment fix. Better tests.