removing redundant test class, removing redundant utils