Workong on travis-ci setup glitch.
Updated tests to work with new __init__ switch for setup.