Add more test units