unittest package ref fixes