Updated to work with mobile testing