clean up test
stricter tests