Some errors fixed: Tests still pass!