Added more test procedures