Add data-elements binding
Move test next to similar tests
Fixed some mixed spaces and tabs