Most test cases working