Updating unit tests, they do not all work yet (API vastly different now)