Add new tests for keys