more test updates, still WIP