Improved read/write variable Int32 test
Updated TODO and minor changes