Merge "Add final tests for the Status class"