Add more unit completion tests