Test updated to support WP8 as well.