Test class modifications

Modifications on test classes