minor changes with testing code