Fix Issue 26
Add TestUnit Issue26