Started working on unit test...