Adding tests

### Draft: Do not merge