companion to #863, also cleans up some test memory issues
actually using usings
Merge branch 'gidden-rbp2' into develop