Update test functions structure