Started working on some unit tests