Made test simpler
Merge branch 'release/2014-12-03_2'