Test 2.0

You asked me to provide some test for my recent change. And as I was going through them I just saw a lot of warnings and failing / not reasonable tests. So I just cleaned it up a bit :lipstick: 

cheers