Updated wrappers, added new ones
Smarter about selecting the right media player; new tests