Unit test and bug fix