wip - more test stuff