Use non default package and add more tests.