Add exception test
Fix lists and add tests for them