Moved test support modules to more appropriate location.