Rewrote "New" Unit Tests and Included Some Fixes

High fives all around for proper testing.