convert tests to use junit