Comment 8 for bug 1172973

Yes, change is in progress. Looks good as discussed so far, rough testing on the live location works. Next step will be the change of the tests to use a simulated storage.