Merge "Add a test that we get samples for a common core-oj method"