Refactor tests into package and multiple specs

For better reporting —- hopefully this is useful