WIP
More tests