Updated tests from master