Updated unit-tests and change method signature