Updated Tests
Prepping for publishing