Merging sub theme tests and JS fixes

#3131 

There was a PR(#3138) for that, bu now i'm making a PR after the Travis tests are back.