Updated tests to match new structure. Documentation tweaks