Improve tests creation