refactor package tests.