ENCUESTAME-651 small bug fixes during the process to create unit tests