Added more utils

More test files