Drop duplicate test and some minor code style changes.