finishing implementation of evalulation, starting tests