Added: Added test for self-modification; changed resuls flow