#9 improved test structure