Tests all pass now