Remove testbench package and fix tests.
Add tests
Add and rename tests
Add new test