updated linear and nn interpolators and added tests