Refactored step function to application layer
Added integration test for win