Add test for default lifetime
Add singleton lifetime