updated expected files to reflect logic changes so tests pass
updated logic to reflect new business rules--howdy it is!