Fixed unit tests for changed structure