Update to tests

Increasing Coverage, fix classes a little