Unit tests for #2020