Removing the hard-coded dependency to 'web' device-type for SimplePush clients; Added tests and updated existing ones