Remove circular dependency.
Make the test more deterministic
Remove extra whitespace
Add copyright notice to the file
Merge pull request #111 from syrnick/test_improvement

Test improvement