All but that last method covered by unit testing

I have questions regarding the last one. If it needs coverage I will provide
that and an explanation in the future.