Refactoring for 2.0
Refactor tests to use Specta