Work on some tests