Updated cases for unit-tests