- first successful test
- fixes after CR
- fixes after CR - part 2