[WIP] More tests