Begin consolidating our test code / converting to BDD.