Style nitpicks
Fix test suite