tweaks and big shell test