Added minimal unit tests