fix tests to run
refactor for new interface

https://github.com/koriym/BEAR.Sunday/commit/16a5637c26f3fdb90b41c87ff79
184f0ece4686b