Test cases improvements.