housekeeping, fix tests