Fixed ranges, added basic lists; updated tests