changes on test after merge with master