Unit test and more precise name parsing