Convert to unittest format so that more tests can be added cleanly.