WIP More tests