Refactored names to make them less confusing, functional tests