* new user branch * Resolve formatting issues on test scripts * Resolve formatting issues on test scripts