Apply Google Style Guide to basic acceptance test. Minor improvements on E2E Test