Adding OAC harvest and fixing tests.