configs cleanup, testing updated