Add uuidgenerator
Fix test. Fix injection.