WIP: working on tests