Some progress

* Update test folder structure
* Add regression tests
* Add default Subscription object