updating tests, WIP