Fixed bug in test.
Merge branch 'new_branch_name'