Copied tests from branch