Fixed up test library to make testing easier