Updated e2e Tests and revised comments.