Corrected tests so far