Add tests for 21