Some style fixes and removed duplicated test