Fix/add tests.