Added "scheme" options. Reformatted tests.