A little reorganization
Let's get the old tests running for now