Serial version remade, now runs every test. To be made parallel