add tests in s00 and partially in s01