User: Initial implementation
Util: Fixed typo in test