Updated Unit Tests

Fixes #8