MUS-93 Added play all test

Added play all test
Did some minor refactoring