Updated utils and added tests to test out the utils
Updated utils and utils unit tests