WIP: rewrite of tests