Added listu, added tests