Correct status and add tests