more tests! WIP