More beautious tests passing. closer to original functionality. MAD SLOW