Added test and code for lizard and spock