improve these tests