Partial passing tests Dec 2