Get rid of null statements; add some tests; add some parsing