Fix up tests and move some dispose listeners
Don't need a dispose listener on player