Remove debugging code and use 'original' instead of 'old' as stubbing prefix in tests