JBTIS-28: Fixed test features and site
Merge remote-tracking branch 'apodhrad/JBTIS-28'