Extend and refactor tests; get rid of LIST*