more helpful comments
updated e2e test scenarios