Fixed up lib and tests are green