fix: now passing all unit tests.