Merged tests from dev branch