Some code cleanup.
Additional tests verifying atom hopper usage behaviour
Merge branch '1.20-candidate' into jira-CLB-191