And import fix.
initial changes to fix tests for baseurl changes more test fixes moving some test spec stuff around