unit tests?

Change-Id: Ic8877e394d09c050286c0aafe2f4ac62ac1fce4d