Added more test units