Update unit tests for recent changes