improve tests for 21