Started writing tests for issue #5