move putchar_test and misc changes