CD-19
- getting rid of test warnings