added slider test
fixed merge conflict