master declare type is passing
logic fix'
cleanup
master move dumb test case