Adding tests and fixing constraint for step=""