Rearrange tests and demos
Some minor fixes and complete position easing