end2end tests almost there