Updated unit tests to reflect spec changes