Added status validation and test