Fix two issues:
- Remove unneeded code, which makes test harder to read and write
- Fix wrong indentation, which breaks some editors
Fix two issues:
The wrong indentation breaks editor workflows.
Can be reviewed with --ignore-all-space
cr/tACK 0000edaba306487a750f5648438f3dc8de08127c
ACK 0000edaba306487a750f5648438f3dc8de08127c
Code review ACK 0000edaba306487a750f5648438f3dc8de08127c