Fix style issue
Fix test names