more testing work, wip