More unit tests, func signatures changed