Started to add tests.