Added test for basic inventory actions
Merge branch 'ferrybig'
Merge branch 'sander'