Added more checks for ToS test