added utils and test class