added ball and ring moves with tests