More testcases

Fixed logic bugs in status