Add some unit testing
Address more of Brandon's comments