Imported code style and renamed test Methods