Minor changes, added testrange