Fixed Tests & Minor Cleanup

Related to #4