Adding unit tests for #23 (minimal)