Fixed up remaining errors and tests are passing