added backward compatibility for test cases