Updating the test points & fixing defs