Updates to add unit tests and perform oracle tests