Issue #39 Modifying existing classes to support test case steps