Getting some tests passing