improved tests, WIP