Merge "Move AudioPlayer to test commands"