convert to own tests