Copied over new tests from devel branch