Add app and user option to tests