Issue #363 - Add tests