Update spec and unit test