Unit tests and removing unused inner class