Modified commands in build_and_test