fixing and finishing tests