Added unit tests for #106