Add status validations and tests

Problems in some of the tests. TODO fix it.