Unit test coming along.