Rearrange cucumber spec

Just rearrange test cases