Merge pull request #1179 from ppekrol/master

moving tests - 2.5-3.0 merge flashback