Add status validation and test