Updated unit tests to work with current version