Improvements to testing and related styling