Some more fixes for status + unit tests