Add more utils and tests