Add basic test cases (#2)
Fix name parsing bug