Refactored tests package to test for consistency with test package in safe