Fixing some code style issues with tests