bonna/kevin - refactored to write unit tests for methods only used for another method