Fixes to stop and more test cases
build