expanded unittest coverage to 100%