Fixed status parsing, extended tests for status parsing