Add computer test case
Fix parsing of common tag