clean more levels now with fixed test structure