WIP adding unit tests.