Adds a few test that proved some weaknesses that all has been fixed.