TestState updates reflecting all recent changes.
TestState updates reflecting all recent changes.

Also does some Inventory related shenanigans.

exjam/rosebrowser,exjam/rosebrowser,brett19/rosebrowser,brett19/rosebrowser,Jiwan/rosebrowser,Jiwan/rosebrowser