fix enrollment, fucking interactor upgrade. also new tests