Added lizard and spock, and completed the tests for them