Added more checks for ToS test

As subject says