fixed js Tests
Merge branch 'TestFixBs' into bootstrap