Merged tests from master