Initial unit tests and related adjustments