adding support for usercyle with tests