Mostly fixes problems with test architechture causing errors