Make the common part of the System API work and added TestCase from the 
Session API