Refactored variable names
Tests