Add tests
More concise style without explicit else.
Version bump + deps for testing