And add tests