Added more test capabilities