fixed tests, still need to do interp and add all other jazz