Some cleanup of where tests go. Still in flux.