Fixes #1452: Add Unit Test