Add status validation and tests