REFACTORING: system test
REFACTORING: register blocking
FIX: typo
NEW: test case