Add unit tests for #429