Feature/NOW-208 Improve test coverage