Merge branch feature/new_test_45631439

Sprint story: http://www.pivotaltracker.com/story/show/45631439
Main story: None