Fix unit test and add methods.