Improve tests syntax