test restructuring, so tests will be broken for now...