#22 Fix manufacturer ids and include unit test