WIP: refactor tests