Getting some tests in place