Refactored AD tests (note: exposes existing errors)