Test cases almost done