start cleaning up

use variables to make test more portable