Updated tests and list impl