Fix to step tests
Updated and refactored stripe implementation