Committing with some known problems around the Audit test; however,
there's a lot of changes I don't want to lose.