test/BasicTest.java, test/FuncTest.java updated