Reenabled commented-out unit tests