Tests all passing, coverage increasing.