fixup test styles and implementations