diff --git a/lib/include/uart.h b/lib/include/uart.h
index 1532f74b0..08ce15bd2 100644
--- a/lib/include/uart.h
+++ b/lib/include/uart.h
@@ -152,6 +152,7 @@ static volatile struct UART_struct * const UART2 = (void *) (UART2_BASE);
 
 #endif /* REG_NO_COMPAT */
 
+void uart_init(volatile struct UART_struct * uart, uint32_t baud);
 void uart_setbaud(volatile struct UART_struct * uart, uint32_t baud);
 
 extern volatile uint32_t  u1_head, u1_tail;
diff --git a/lib/uart.c b/lib/uart.c
index e76ec0010..1cc5c41ec 100644
--- a/lib/uart.c
+++ b/lib/uart.c
@@ -65,7 +65,7 @@ void uart_setbaud(volatile struct UART_struct * uart, uint32_t baud) {
 	};
 }
 
-void uart_init(volatile struct UART_struct * uart) {
+void uart_init(volatile struct UART_struct * uart, uint32_t baud) {
 	/* enable the uart so we can set the gpio mode */
 	/* see Section 11.5.1.2 Alternate Modes */
 	/* you must enable the peripheral first BEFORE setting the function in GPIO_FUNC_SEL */
@@ -113,5 +113,8 @@ void uart_init(volatile struct UART_struct * uart) {
 
 		enable_irq(UART2);
 	}
+
+	uart_setbaud(uart, baud);
+
 }
 
diff --git a/tests/adc.c b/tests/adc.c
index 949913b12..92fec985e 100644
--- a/tests/adc.c
+++ b/tests/adc.c
@@ -45,7 +45,6 @@ int main(void)
 	uint8_t c;
 
 	trim_xtal();
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 	adc_init();
 
diff --git a/tests/asm.c b/tests/asm.c
index 1718142f9..087afba72 100644
--- a/tests/asm.c
+++ b/tests/asm.c
@@ -52,8 +52,7 @@ void main(void) {
 	/* trim the reference osc. to 24MHz */
 	trim_xtal();
 
-	uart_init(UART1);
-	uart_setbaud(UART1, 115200);
+	uart_init(UART1, 115200);
 
 	vreg_init();
 
diff --git a/tests/autoack-rx.c b/tests/autoack-rx.c
index 9f00667bc..03de59249 100644
--- a/tests/autoack-rx.c
+++ b/tests/autoack-rx.c
@@ -64,7 +64,6 @@ void main(void) {
 	/* trim the reference osc. to 24MHz */
 	trim_xtal();
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	vreg_init();
diff --git a/tests/autoack-tx.c b/tests/autoack-tx.c
index d9067e8fd..205c18a49 100644
--- a/tests/autoack-tx.c
+++ b/tests/autoack-tx.c
@@ -99,7 +99,6 @@ void main(void) {
 	/* trim the reference osc. to 24MHz */
 	trim_xtal();
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	vreg_init();
diff --git a/tests/flasher.c b/tests/flasher.c
index 16c2eac70..e04495490 100644
--- a/tests/flasher.c
+++ b/tests/flasher.c
@@ -84,7 +84,6 @@ void main(void) {
 	volatile uint32_t state = SCAN_X;
 	volatile uint32_t addr,data;
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	disable_irq(UART1);
diff --git a/tests/nvm-read.c b/tests/nvm-read.c
index 68229cf9c..c100f07db 100644
--- a/tests/nvm-read.c
+++ b/tests/nvm-read.c
@@ -46,12 +46,18 @@ void main(void) {
 	uint32_t buf[READ_NBYTES/4];
 	uint32_t i;
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	print_welcome("nvm-read");
 
 	vreg_init();
+//	buck_init();
+	while(CRM->STATUSbits.VREG_1P5V_RDY == 0) { continue; }
+	while(CRM->STATUSbits.VREG_1P8V_RDY == 0) { continue; }
+
+	printf("Sys cntl %08x\n\r",  (unsigned int)CRM->SYS_CNTL);
+	printf("vreg cntl %08x\n\r", (unsigned int)CRM->VREG_CNTL);
+	printf("crm status %08x\n\r", (unsigned int)CRM->STATUS);
 
 	if(NVM_INTERFACE == gNvmInternalInterface_c)
 	{
@@ -75,7 +81,7 @@ void main(void) {
 	err = nvm_read(NVM_INTERFACE, type, (uint8_t *)buf, READ_ADDR, READ_NBYTES);
 	printf("nvm_read returned: 0x%02x\r\n", err);
 
-	for(i=0; i<READ_NBYTES/4; i++) {
+	for(i=0; i<16/4; i++) {
 		printf("0x%08x\r\n", (unsigned int)buf[i]);
 	}
 		
diff --git a/tests/nvm-write.c b/tests/nvm-write.c
index 0a2a2d0d1..660ee2f3d 100644
--- a/tests/nvm-write.c
+++ b/tests/nvm-write.c
@@ -46,7 +46,6 @@ void main(void) {
 	uint32_t buf[WRITE_NBYTES/4];
 	uint32_t i;
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	print_welcome("nvm-write");
diff --git a/tests/per.c b/tests/per.c
index 0628ba0be..f3a795b96 100644
--- a/tests/per.c
+++ b/tests/per.c
@@ -117,7 +117,6 @@ void main(void) {
 	/* trim the reference osc. to 24MHz */
 	pack_XTAL_CNTL(CTUNE_4PF, CTUNE, FTUNE, IBIAS);
 	
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	vreg_init();
diff --git a/tests/printf.c b/tests/printf.c
index 4018eb863..45b28fb33 100644
--- a/tests/printf.c
+++ b/tests/printf.c
@@ -76,8 +76,7 @@ int main(void)
 	int mi;
 //	char buf[80];
 
-	uart_init(UART1);
-	uart_setbaud(UART1, 115200);
+	uart_init(UART1, 115200);
 
 	print_size(int8_t);
 	print_size(uint8_t);
diff --git a/tests/pwm.c b/tests/pwm.c
index b01938ae6..8318e7b5d 100644
--- a/tests/pwm.c
+++ b/tests/pwm.c
@@ -46,7 +46,6 @@ int main(void)
 	int x = 32768;
 	
 	trim_xtal();
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 	rtc_init();
 	
diff --git a/tests/rftest-rx.c b/tests/rftest-rx.c
index 22cda69be..2f3d5cf71 100644
--- a/tests/rftest-rx.c
+++ b/tests/rftest-rx.c
@@ -62,7 +62,6 @@ void main(void) {
 	/* trim the reference osc. to 24MHz */
 	trim_xtal();
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	vreg_init();
diff --git a/tests/rftest-tx.c b/tests/rftest-tx.c
index b2439df45..4ac413902 100644
--- a/tests/rftest-tx.c
+++ b/tests/rftest-tx.c
@@ -70,7 +70,6 @@ void main(void) {
 	/* trim the reference osc. to 24MHz */
 	trim_xtal();
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	vreg_init();
diff --git a/tests/romimg.c b/tests/romimg.c
index 63e419a6b..1992834e2 100644
--- a/tests/romimg.c
+++ b/tests/romimg.c
@@ -42,7 +42,6 @@
 void main(void) {
 	volatile uint8_t *data;
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	for(data = DUMP_BASE; data < ((uint8_t *)(DUMP_BASE+DUMP_LEN)); data++) {
diff --git a/tests/sleep.c b/tests/sleep.c
index 98ab58cd5..edd4a474a 100644
--- a/tests/sleep.c
+++ b/tests/sleep.c
@@ -41,7 +41,6 @@
 
 void main(void) {
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	*mem32(0x00401ffc) = 0x01234567;
diff --git a/tests/u1u2-loopback.c b/tests/u1u2-loopback.c
index 63020ce21..5956ecc5e 100644
--- a/tests/u1u2-loopback.c
+++ b/tests/u1u2-loopback.c
@@ -41,10 +41,8 @@
 
 void main(void) {
 
-	uart_init(UART1);
-	uart_init(UART2);
-	uart_setbaud(UART1, 115200);
-	uart_setbaud(UART2, 115200);
+	uart_init(UART1, 115200);
+	uart_init(UART2, 115200);
 	
 	while(1) {
 		if(uart1_can_get()) {
diff --git a/tests/uart1-loopback.c b/tests/uart1-loopback.c
index 2db70b297..ec73c742b 100644
--- a/tests/uart1-loopback.c
+++ b/tests/uart1-loopback.c
@@ -41,9 +41,7 @@
 
 void main(void) {
 
-//	uart1_init(INC,MOD,SAMP);
-	uart_init(UART1);
-	uart_setbaud(UART1, 1200);
+	uart_init(UART1, 115200);
 	
 	while(1) {
 		if(uart1_can_get()) {
diff --git a/tests/wdt.c b/tests/wdt.c
index fccc7dfd5..a43b10ceb 100644
--- a/tests/wdt.c
+++ b/tests/wdt.c
@@ -46,7 +46,6 @@
 void main(void) {	
 	volatile uint32_t i;
 
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 
 	printf("reset\n\r");
diff --git a/tests/xtal-trim.c b/tests/xtal-trim.c
index 1b0952843..e71af2796 100644
--- a/tests/xtal-trim.c
+++ b/tests/xtal-trim.c
@@ -48,7 +48,6 @@ int main(void)
 	ctune = 0;
 	ftune = 0;
 	
-	uart_init(UART1);
 	uart_init(UART1, 115200);
 	
 	print_welcome("pwm test\r\n");