Additional selection tests and interpolation fix