Updated tests for Self model.