Fixed some small errors, tests are now green