cleanup work and starting new tests