Issue #2 - Add feature tests and steps