Added a few Tests and Tweaks