Fix Failing Tests.

* Add Some Little Cleanups.