Introduced regression tests for #17