add status validation and tests