Moved __init__ to top. Test failure fixed?