Add several unit tests