Tweak behaviour a bit
Add initial test non jquery version