test additions
refactored