clean tests, about to deprecate old code