Fixes style issues and incorrect test