Addition of FunctionTest and HandTest