tweaks to style and test suites