Tests show more consistent results
Done for now, still needs work