Update from SVN version
Add test code for analysis