Fix style
Fix tests(pass!)