Updated tests after master rebase.