#1763 working on some unit testing