More unit testing, just about completely covered.