local test improvements
cleaning