Fixed pull request changes and started adding tests.