Use definitions.
Fix broken test and comment out test case that's intentionally removed.