WIP: test updates