Unit Tests & Bugs Fixed