Corrected test and interface