Add status validation snad tests