Tests all pass now.