Fix tests and a bit of reorg
Moved datafile into new SourceBook folder