Many things have changed and the test's are throwing errors