somewhat improved test organization
preparing for interface proxy