added test, refactored method name... renaming vars...