Fixed up issues and error tests are looking good