tidy tests slightly
add an extra end to end test