Commit forlorn __init__.py, extend custrom format tests