Updates with minor unit tests
Updates minor unit tests