WIP - fix tests dalek