all tests from old class ported, a few starting to work