Fixed package errors and tests passing again