Fixed pull request changes and started adding tests.

this file shouldn't be committed.