Fixed up test issues and everything looks great