Update major to subject code map, fix tests for 2013 edition