Removed test only code
Added includes to make available to external clients