Unit Tests Done Fixes #10