Fixed up issues and update test is good