added some overloading on utilities functions, adjusted some tests