Getting some unit testing along the way...