Updated unit tests for new methods