fixed list related issues and cleaned up tests