moving tests out of doctest
Moving things around