Refactor Byes tests