Get some tests in place and some style changes in.