mini fix & deleted test code