Temporarily fixed unit-test errors introduced by code changes per new specifications.