Added custom shrinking
Needed to specify command type after all
Tweaks and debugging
Better shrinking
improve the test a little