Get some tests passing