added package_test, some test cleanup