Remove empty if-block and CamelCase test names