remove test limitations, add progress printout, remove import