Unit test this inner class
Start for unit tests for this new class