Enhancement: test setup
Enhancement: add tests