Tweaked parameters, further tests