Commit generated js after merge
Add tests for custom state handlers