Update for tests
More validation`