fixed testing mode
clean up