merge visual test style changes in from master
merge visual test data changes in from master