Add tests

```
- remove the old fields.
```