Reduced the number of times I load test assembly
More reduction of loading
Fixed Tests that fail in build environment