Add 1st unit tests