Changes to testing. Now more unit, less integration