building out test. adding class and improving methods/calls. cleaning up steps, etc