fixing up packages and test errors