We also need unit tests for this