Added util and test classes